Allow passing --triple alone to select a Swift SDK#10022
Conversation
Simply aliases it to `--swift-sdk triple` and finally adds a help string for the flag, fixes swiftlang#7330.
finagolfin
requested review from
bkhouri,
bripeticca,
cmcgee1024,
daveinglis,
daveyc123,
dschaefer2,
jakepetroules,
owenv,
plemarquand and
rconnell9
as code owners
| } else if let customCompileTriple { | ||
| (ID, swiftSDK) = try store.selectBundle(matching: customCompileTriple.tripleString, hostTriple: hostTriple) | ||
| } else { | ||
| fatalError("Neither an SDK nor a triple matched somehow.") |
There was a problem hiding this comment.
This should never hit, but just putting it in as a guard rail.
|
I'm not 100% confident that it doesn't break existing But specifying |
Yep, this pull merely implements a shorter form for when only a single SDK includes that triple, and if you happen to have multiple SDKs installed that contain the same triple, it now gives you a nice error about what to do, #9937. You can try that out for yourself with the current trunk snapshot toolchain by passing in |
I think this is a reasonable argument -- it trains people to use something that may just break as soon as they install another SDK, which makes things feel unstable. |
Unfortunately, that is what all our doc does right now, just with the Now that specifying both the SDK and the triple works with #9955, which we need to get into 6.3, #9998, I will update that doc to tell people to use both flags, then this could just remain a shortcut for those who know what they're doing. I'll try to get the compiler/SDK version checking in for 6.4, so that will take away the main source of problems, and allow people to use this flag alone. |
3 participants
Simply aliases it to
--swift-sdk tripleand finally adds a help string for the flag, fixes #7330. I checked to make sure the--swift-sdkerror strings still make sense and they do, because they use the generic word "query" anyway.This passed all tests locally on macOS except for one:
That test was added in #8034, in support of a strange config where you could use the host SDK but override the triple, ie ignoring the installed bundles. Supporting that is not going to work with selecting a triple from the installed bundles as requested in #7330, unless we check if no bundles are installed, and only then default to the host SDK override logic. That will be weird for the user, where the host SDK override is applied only if no bundles happen to be installed.
Instead, I think we should just throw out that host toolset override logic, and move this line to only apply to the now somewhat-deprecated destination config files.
This
--tripleflag was introduced in #2604 to really only apply to destination files at the time, and probably never worked well for the host destination it was also applied to then. It probably doesn't work very well for host SDK overrides today, unless you really know what you're doing.Better to only apply this
--tripleflag to the old destination files, which it was first introduced for, and as a selector for Swift SDK bundles, as I do in this pull, throwing out the old host override logic and closing #8716 as unsupported. I think we have a free hand here, since this flag was never documented till now. I'll adjust that test and add a couple more depending on what's decided.Let me know what you think, @jakepetroules, @kateinoigakukun, and @MaxDesiatov.